Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump compiler_builtins #124886

Closed
wants to merge 1 commit into from
Closed

chore: Bump compiler_builtins #124886

wants to merge 1 commit into from

Conversation

Patryk27
Copy link
Contributor

@Patryk27 Patryk27 commented May 8, 2024

@rustbot
Copy link
Collaborator

rustbot commented May 8, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 8, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
Amjad50 added a commit to Amjad50/rust that referenced this pull request May 10, 2024
@Amjad50
Temporarily update compiler_builtins
8998c6a 
There is a PR already for this
(rust-lang#124886), but looks like there
are some issues with `f16`, `f128`, this commit just update it anyway
for this custom branch
@Mark-Simulacrum
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2024
@bors
Copy link
Contributor

bors commented May 11, 2024

☔ The latest upstream changes (presumably #124213) made this pull request unmergeable. Please resolve the merge conflicts.

@Patryk27 Patryk27 mentioned this pull request May 12, 2024
Open
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/sys_common/backtrace.rs:34:9
   9:     0x7f1a45a08779 - std::panicking::default_hook::{{closure}}::h6216a28caae3e00c
  10:     0x7f1a45a084bd - std::panicking::default_hook::h5f0ed70b16f10e16
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/panicking.rs:298:9
  11:     0x7f1a426e4077 - std[b95b9362c262c367]::panicking::update_hook::<alloc[5be86f0f543940e9]::boxed::Box<rustc_driver_impl[e2b437a5caec2333]::install_ice_hook::{closure#0}>>::{closure#0}
  12:     0x7f1a45a08e76 - <alloc::boxed::Box<F,A> as core::ops::function::Fn<Args>>::call::hffefc6c0c7fdd8a5
  13:     0x7f1a45a08e76 - std::panicking::rust_panic_with_hook::h3ca094bb5ec04c38
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/panicking.rs:799:13
  14:     0x7f1a45a08beb - std::panicking::begin_panic_handler::{{closure}}::hbe1c2f230d27e9b3
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/panicking.rs:656:13
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/panicking.rs:656:13
  15:     0x7f1a45a064f9 - std::sys_common::backtrace::__rust_end_short_backtrace::h7908055d1ea4f4f2
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/sys_common/backtrace.rs:171:18
  16:     0x7f1a45a08957 - rust_begin_unwind
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/panicking.rs:652:5
  17:     0x7f1a45a51763 - core::panicking::panic_fmt::h8ed2e06c66ae3e21
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/core/src/panicking.rs:72:14
  18:     0x7f1a4305746f - <rustc_symbol_mangling[8e0e56e8f1646f9d]::v0::SymbolMangler as rustc_middle[27c71549f86bc4e4]::ty::print::Printer>::print_type
  19:     0x7f1a430565c7 - <rustc_symbol_mangling[8e0e56e8f1646f9d]::v0::SymbolMangler as rustc_middle[27c71549f86bc4e4]::ty::print::Printer>::print_impl_path
  20:     0x7f1a43055607 - <rustc_symbol_mangling[8e0e56e8f1646f9d]::v0::SymbolMangler as rustc_middle[27c71549f86bc4e4]::ty::print::Printer>::print_def_path
  21:     0x7f1a43055cc6 - <rustc_symbol_mangling[8e0e56e8f1646f9d]::v0::SymbolMangler as rustc_middle[27c71549f86bc4e4]::ty::print::Printer>::print_def_path
  22:     0x7f1a43054e06 - rustc_symbol_mangling[8e0e56e8f1646f9d]::v0::mangle
  23:     0x7f1a43df550a - rustc_symbol_mangling[8e0e56e8f1646f9d]::symbol_name_provider
  24:     0x7f1a43df36aa - rustc_query_impl[125614f3d09f8be0]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[125614f3d09f8be0]::query_impl::symbol_name::dynamic_query::{closure#2}::{closure#0}, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 16usize]>>
  25:     0x7f1a442223d7 - rustc_query_system[31ce1c48951a2506]::query::plumbing::try_execute_query::<rustc_query_impl[125614f3d09f8be0]::DynamicConfig<rustc_query_system[31ce1c48951a2506]::query::caches::DefaultCache<rustc_middle[27c71549f86bc4e4]::ty::instance::Instance, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 16usize]>>, false, false, false>, rustc_query_impl[125614f3d09f8be0]::plumbing::QueryCtxt, false>
  26:     0x7f1a442220da - rustc_query_impl[125614f3d09f8be0]::query_impl::symbol_name::get_query_non_incr::__rust_end_short_backtrace
  27:     0x7f1a43fd4380 - rustc_codegen_ssa[361d05578c83eb19]::back::symbol_export::reachable_non_generics_provider
  28:     0x7f1a4466c2df - rustc_query_impl[125614f3d09f8be0]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[125614f3d09f8be0]::query_impl::reachable_non_generics::dynamic_query::{closure#2}::{closure#0}, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 8usize]>>
  29:     0x7f1a4466b23b - rustc_query_system[31ce1c48951a2506]::query::plumbing::try_execute_query::<rustc_query_impl[125614f3d09f8be0]::DynamicConfig<rustc_query_system[31ce1c48951a2506]::query::caches::VecCache<rustc_span[4cf4b8ad273124e]::def_id::CrateNum, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 8usize]>>, false, false, false>, rustc_query_impl[125614f3d09f8be0]::plumbing::QueryCtxt, false>
  30:     0x7f1a4466ad0c - rustc_query_impl[125614f3d09f8be0]::query_impl::reachable_non_generics::get_query_non_incr::__rust_end_short_backtrace
  31:     0x7f1a4450000d - rustc_codegen_ssa[361d05578c83eb19]::back::symbol_export::exported_symbols_provider_local
  32:     0x7f1a43c03ff9 - rustc_query_impl[125614f3d09f8be0]::plumbing::__rust_begin_short_backtrace::<rustc_query_impl[125614f3d09f8be0]::query_impl::exported_symbols::dynamic_query::{closure#2}::{closure#0}, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 16usize]>>
  33:     0x7f1a43c03fcf - <rustc_query_impl[125614f3d09f8be0]::query_impl::exported_symbols::dynamic_query::{closure#2} as core[1795d7877ae73ac1]::ops::function::FnOnce<(rustc_middle[27c71549f86bc4e4]::ty::context::TyCtxt, rustc_span[4cf4b8ad273124e]::def_id::CrateNum)>>::call_once
  34:     0x7f1a444599cc - rustc_query_system[31ce1c48951a2506]::query::plumbing::try_execute_query::<rustc_query_impl[125614f3d09f8be0]::DynamicConfig<rustc_query_system[31ce1c48951a2506]::query::caches::VecCache<rustc_span[4cf4b8ad273124e]::def_id::CrateNum, rustc_middle[27c71549f86bc4e4]::query::erase::Erased<[u8; 16usize]>>, false, false, false>, rustc_query_impl[125614f3d09f8be0]::plumbing::QueryCtxt, false>
  35:     0x7f1a4445954f - rustc_query_impl[125614f3d09f8be0]::query_impl::exported_symbols::get_query_non_incr::__rust_end_short_backtrace
  36:     0x7f1a44143ba6 - <rustc_metadata[8c492e31054b7623]::rmeta::encoder::EncodeContext>::encode_crate_root
  37:     0x7f1a4484abe5 - rustc_metadata[8c492e31054b7623]::rmeta::encoder::encode_metadata
  38:     0x7f1a44848d49 - rustc_metadata[8c492e31054b7623]::fs::encode_and_write_metadata
  39:     0x7f1a448481c0 - rustc_interface[1c6f0d4c303def7d]::passes::start_codegen
  40:     0x7f1a44847a18 - <rustc_interface[1c6f0d4c303def7d]::queries::Queries>::codegen_and_build_linker
  41:     0x7f1a445a92fe - rustc_interface[1c6f0d4c303def7d]::interface::run_compiler::<core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>, rustc_driver_impl[e2b437a5caec2333]::run_compiler::{closure#0}>::{closure#1}
  42:     0x7f1a4459654b - std[b95b9362c262c367]::sys_common::backtrace::__rust_begin_short_backtrace::<rustc_interface[1c6f0d4c303def7d]::util::run_in_thread_with_globals<rustc_interface[1c6f0d4c303def7d]::interface::run_compiler<core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>, rustc_driver_impl[e2b437a5caec2333]::run_compiler::{closure#0}>::{closure#1}, core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>>
  43:     0x7f1a44596346 - <<std[b95b9362c262c367]::thread::Builder>::spawn_unchecked_<rustc_interface[1c6f0d4c303def7d]::util::run_in_thread_with_globals<rustc_interface[1c6f0d4c303def7d]::interface::run_compiler<core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>, rustc_driver_impl[e2b437a5caec2333]::run_compiler::{closure#0}>::{closure#1}, core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[1795d7877ae73ac1]::result::Result<(), rustc_span[4cf4b8ad273124e]::ErrorGuaranteed>>::{closure#2} as core[1795d7877ae73ac1]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
  44:     0x7f1a45a12cab - <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once::h6f28929796384304
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/alloc/src/boxed.rs:2022:9
  45:     0x7f1a45a12cab - <alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once::hc19b559e890f4bf0
  46:     0x7f1a45a12cab - std::sys::pal::unix::thread::Thread::new::thread_start::h59a9f965326b1725
                               at /rustc/6b544f5ff8d45221d61962651a5f5ab9fe535e16/library/std/src/sys/pal/unix/thread.rs:108:17
  47:     0x7f1a3f66bac3 - <unknown>
  48:     0x7f1a3f6fd850 - <unknown>
  48:     0x7f1a3f6fd850 - <unknown>
  49:                0x0 - <unknown>

error: the compiler unexpectedly panicked. this is a bug.

note: using internal features is not supported and expected to cause internal compiler errors when used incorrectly

note: please attach the file at `/cargo/registry/src/index.crates.io-6f17d22bba15001f/compiler_builtins-0.1.112/rustc-ice-2024-05-12T15_51_29-2576.txt` to your bug report

note: compiler flags: --crate-type lib -C opt-level=3 -C embed-bitcode=no -C codegen-units=10000 -C debug-assertions=on -Z unstable-options -C strip=debuginfo -C symbol-mangling-version=v0 -Z unstable-options -Z macro-backtrace -C split-debuginfo=off -C prefer-dynamic -Z inline-mir -Z inline-mir-preserve-debug -C link-args=-Wl,-z,origin -C link-args=-Wl,-rpath,$ORIGIN/../lib -C force-frame-pointers=yes -Z crate-attr=doc(html_root_url="https://doc.rust-lang.org/nightly/") -Z binary-dep-depinfo -Z unstable-options -Z force-unstable-if-unmarked
note: some of the compiler flags provided by cargo are hidden

query stack during panic:
query stack during panic:
#0 [symbol_name] computing the symbol for `float::<impl at /cargo/registry/src/index.crates.io-6f17d22bba15001f/compiler_builtins-0.1.112/src/float/mod.rs:108:9: 108:27>::normalize`
#1 [reachable_non_generics] looking up the exported symbols of a crate
#2 [exported_symbols] collecting exported symbols for crate `0`
error: could not compile `compiler_builtins` (lib)
warning: build failed, waiting for other jobs to finish...
Build completed unsuccessfully in 0:00:28
+ set -e

@Patryk27
Copy link
Contributor Author

Patryk27 commented May 12, 2024 •
edited
Loading

Ah, I see what's happening - it looks like newest compiler-builtins provides intrinsics for f16 and f128, which are not supported by rustc yet:

rust/compiler/rustc_symbol_mangling/src/v0.rs

Line 322 in dde8cfa

// FIXME(f16_f128): update these once `rustc-demangle` supports the new types

compiler-builtins provides a dedicated feature-switch to disable those intrinsics:

https://github.com/rust-lang/compiler-builtins/blob/9dd4dbfcc68a2f57a1772e8c8e90f0dfa19e7cf0/Cargo.toml#L52

... so, I guess, the question is: should rustc simply force-activate it? (if so, how? -- I'm not sure on this part)

cc @Mark-Simulacrum

(funnily enough, ./x.py build on my machine works correctly)

@klensy klensy mentioned this pull request May 12, 2024
Merged
@tgross35
Copy link
Contributor

tgross35 commented May 16, 2024 •
edited
Loading

Note that #125016 does the same thing, and has some more discussion about how to handle the f16/f128 feature

@beetrees
Copy link
Contributor

beetrees commented May 16, 2024 •
edited
Loading

A rebase should fix the CI failure now that #123816 has been merged. (The error appears to be coming from the bootstrap compiler, so the failure won't be fixed until #123816 reaches stage0.)

@Patryk27
Copy link
Contributor Author

Alright, I'm closing this one, since it's a duplicate of #125016 🙂

@Patryk27 Patryk27 closed this May 17, 2024
@Patryk27 Patryk27 deleted the bump_compiler_builtins branch August 7, 2024 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Patryk27 @rustbot @rust-log-analyzer @Mark-Simulacrum @bors @tgross35 @beetrees